c8a3f8
@@ -24,6 +24,8 @@
 
 package org.jboss.as.jmx;
 
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PROFILE;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -112,27 +114,29 @@
public class JmxAuditLoggerResourceDefinition extends SimpleResourceDefinition {
             }
 
 
-            context.addStep(new OperationStepHandler() {
-                public void execute(final OperationContext context, final ModelNode operation) throws OperationFailedException {
-                    final boolean wasReadOnly = auditLoggerProvider.isLogReadOnly();
-                    final boolean wasLogBoot = auditLoggerProvider.isLogBoot();
-                    final AuditLogger.Status oldStatus = auditLoggerProvider.getLoggerStatus();
-
-                    auditLoggerProvider.setLogReadOnly(JmxAuditLoggerResourceDefinition.LOG_READ_ONLY.resolveModelAttribute(context, model).asBoolean());
-                    auditLoggerProvider.setLogBoot(JmxAuditLoggerResourceDefinition.LOG_BOOT.resolveModelAttribute(context, model).asBoolean());
-                    boolean enabled = JmxAuditLoggerResourceDefinition.ENABLED.resolveModelAttribute(context, model).asBoolean();
-                    auditLoggerProvider.setLoggerStatus(enabled ? AuditLogger.Status.LOGGING : AuditLogger.Status.DISABLED);
-
-                    context.completeStep(new OperationContext.RollbackHandler() {
-                        @Override
-                        public void handleRollback(OperationContext context, ModelNode operation) {
-                            auditLoggerProvider.setLogReadOnly(wasReadOnly);
-                            auditLoggerProvider.setLoggerStatus(oldStatus);
-                            auditLoggerProvider.setLogBoot(wasLogBoot);
-                        }
-                    });
-                }
-            }, OperationContext.Stage.RUNTIME);
+            if (!PROFILE.equals(context.getCurrentAddress().getElement(0).getKey())) {
+                context.addStep(new OperationStepHandler() {
+                    public void execute(final OperationContext context, final ModelNode operation) throws OperationFailedException {
+                        final boolean wasReadOnly = auditLoggerProvider.isLogReadOnly();
+                        final boolean wasLogBoot = auditLoggerProvider.isLogBoot();
+                        final AuditLogger.Status oldStatus = auditLoggerProvider.getLoggerStatus();
+
+                        auditLoggerProvider.setLogReadOnly(JmxAuditLoggerResourceDefinition.LOG_READ_ONLY.resolveModelAttribute(context, model).asBoolean());
+                        auditLoggerProvider.setLogBoot(JmxAuditLoggerResourceDefinition.LOG_BOOT.resolveModelAttribute(context, model).asBoolean());
+                        boolean enabled = JmxAuditLoggerResourceDefinition.ENABLED.resolveModelAttribute(context, model).asBoolean();
+                        auditLoggerProvider.setLoggerStatus(enabled ? AuditLogger.Status.LOGGING : AuditLogger.Status.DISABLED);
+
+                        context.completeStep(new OperationContext.RollbackHandler() {
+                            @Override
+                            public void handleRollback(OperationContext context, ModelNode operation) {
+                                auditLoggerProvider.setLogReadOnly(wasReadOnly);
+                                auditLoggerProvider.setLoggerStatus(oldStatus);
+                                auditLoggerProvider.setLogBoot(wasLogBoot);
+                            }
+                        });
+                    }
+                }, OperationContext.Stage.RUNTIME);
+            }
 
             context.completeStep(OperationContext.RollbackHandler.NOOP_ROLLBACK_HANDLER);
         }
@@ -152,23 +156,25 @@
public class JmxAuditLoggerResourceDefinition extends SimpleResourceDefinition {
 
             context.removeResource(PathAddress.EMPTY_ADDRESS);
 
-            context.addStep(new OperationStepHandler() {
-                public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
+            if (!PROFILE.equals(context.getCurrentAddress().getElement(0).getKey())) {
+                context.addStep(new OperationStepHandler() {
+                    public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
 
-                    final boolean wasReadOnly = auditLogger.isLogReadOnly();
-                    final AuditLogger.Status oldStatus = auditLogger.getLoggerStatus();
+                        final boolean wasReadOnly = auditLogger.isLogReadOnly();
+                        final AuditLogger.Status oldStatus = auditLogger.getLoggerStatus();
 
-                    auditLogger.setLoggerStatus(AuditLogger.Status.DISABLE_NEXT);
+                        auditLogger.setLoggerStatus(AuditLogger.Status.DISABLE_NEXT);
 
-                    context.completeStep(new OperationContext.RollbackHandler() {
-                        @Override
-                        public void handleRollback(OperationContext context, ModelNode operation) {
-                            auditLogger.setLogReadOnly(wasReadOnly);
-                            auditLogger.setLoggerStatus(oldStatus);
-                        }
-                    });
-                }
-            }, OperationContext.Stage.RUNTIME);
+                        context.completeStep(new OperationContext.RollbackHandler() {
+                            @Override
+                            public void handleRollback(OperationContext context, ModelNode operation) {
+                                auditLogger.setLogReadOnly(wasReadOnly);
+                                auditLogger.setLoggerStatus(oldStatus);
+                            }
+                        });
+                    }
+                }, OperationContext.Stage.RUNTIME);
+            }
 
             context.completeStep(OperationContext.RollbackHandler.NOOP_ROLLBACK_HANDLER);
         }
